Skip to content

Add Gen IV Great Marsh changing encounters#1499

Merged
Naramsim merged 7 commits into
PokeAPI:masterfrom
Machine-Maker:feature/gen-iv-great-marsh
May 12, 2026
Merged

Add Gen IV Great Marsh changing encounters#1499
Naramsim merged 7 commits into
PokeAPI:masterfrom
Machine-Maker:feature/gen-iv-great-marsh

Conversation

@Machine-Maker
Copy link
Copy Markdown
Contributor

Change description

Closes #1496

  • Adds new condition type for great marsh selection, x of 32 options.
  • Adds encounters for all the changing pokemon, taking into account pre and post national dex states.

AI coding assistance disclosure

Claude Code helped me analyze decompiled diamond and platinum repos. Also generated the big huge changes based on how they work.

Contributor check list

  • I have written a description of the contribution and explained its motivation.
  • I have written tests for my code changes (if applicable).
  • I have read and understood the AI Assisted Contribution guidelines.
  • I will own this change in production, and I am prepared to fix any bugs caused by my code change.

Copy link
Copy Markdown
Member

@jemarq04 jemarq04 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've been taking a look at these but I think before I do an in-depth review I'd like you to manually go through these yourself. From an initial glance, rates seem to be incorrect and I'm already seeing duplicates from my first look at Area 1 (e.g. Wooper).

I've made a couple other comments below.

Comment thread data/v2/csv/encounter_condition_values.csv Outdated
Comment thread data/v2/csv/encounter_condition_value_prose.csv Outdated
@Machine-Maker
Copy link
Copy Markdown
Contributor Author

Machine-Maker commented Apr 25, 2026

It might look like there are duplicates, but that's just cause there are 2 encounter slots for each area. So we need them to be possible on each slot.

Say for diamond, for example. Each of the "special" pokemon, when selected, have a 10% encounter rate in that area. It's the same for every pokemon. But that 10% is distributed across 2 different encounter slots. This is because it decreases the encounter rate for 2 separate pokemon by 5% each (by replacing that slot). So there are a lot of what seem like duplicates, but they are just in different encounter slots.

The same is true for platinum, there are 2 5% "wooper" encounters that are replaced by the 2 5% encounters for the selected pokemon.

For D/P, its either encounter_slot_id 7 or 8

For Plat, its either encounter_slot_id 129 or 130.

@Machine-Maker Machine-Maker force-pushed the feature/gen-iv-great-marsh branch from d4d7323 to ffddda7 Compare April 25, 2026 05:04
@jemarq04
Copy link
Copy Markdown
Member

jemarq04 commented May 3, 2026

It might look like there are duplicates, but that's just cause there are 2 encounter slots for each area. So we need them to be possible on each slot.

Say for diamond, for example. Each of the "special" pokemon, when selected, have a 10% encounter rate in that area. It's the same for every pokemon. But that 10% is distributed across 2 different encounter slots. This is because it decreases the encounter rate for 2 separate pokemon by 5% each (by replacing that slot). So there are a lot of what seem like duplicates, but they are just in different encounter slots.

The same is true for platinum, there are 2 5% "wooper" encounters that are replaced by the 2 5% encounters for the selected pokemon.

For D/P, its either encounter_slot_id 7 or 8

For Plat, its either encounter_slot_id 129 or 130.

Ok, thanks for the explanation. I've done a more thorough review and the encounters are looking good - thank you for adding these in! All that's left is to address the previous comments I left. I'll take a look at your other PRs soon as well.

Comment thread data/v2/csv/encounter_conditions.csv
Comment thread data/v2/csv/encounters.csv Outdated
@Naramsim
Copy link
Copy Markdown
Member

Naramsim commented May 6, 2026

Oh no! :((( Merge conflicts :)

sorry guys!

@Machine-Maker
Copy link
Copy Markdown
Contributor Author

Ok, fixed conflicts, shifted all the ids down.

@Naramsim Naramsim merged commit 4c6134c into PokeAPI:master May 12, 2026
9 checks passed
@pokeapi-machine-user
Copy link
Copy Markdown

A PokeAPI/api-data refresh has started. In ~45 minutes the staging branch of PokeAPI/api-data will be pushed with the new generated data.

The staging branch will be deployed in our staging environment and the entire API will be ready to review.

A Pull Request (master<-staging) will be also created at PokeAPI/api-data and assigned to the PokeAPI Core team to be reviewed. If approved and merged new data will soon be available worldwide at pokeapi.co.

@pokeapi-machine-user
Copy link
Copy Markdown

The updater script has finished its job and has now opened a Pull Request towards PokeAPI/api-data with the updated data.

The Pull Request can be seen deployed in our staging environment when CircleCI deploy will be finished (check the start time of the last build).

@Machine-Maker Machine-Maker deleted the feature/gen-iv-great-marsh branch May 12, 2026 19:14
Naramsim pushed a commit to PokeAPI/api-data that referenced this pull request May 12, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Great marsh in D/P/Pt missing encounters for the changing pokemon

4 participants